Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Tue, 18 Jul 2023 23:54:08 +0000 (07:54 +0800)

committer Po Lu <luangruo@yahoo.com>

Tue, 18 Jul 2023 23:54:08 +0000 (07:54 +0800)
author Po Lu <luangruo@yahoo.com>
Tue, 18 Jul 2023 23:54:08 +0000 (07:54 +0800)
committer Po Lu <luangruo@yahoo.com>
Tue, 18 Jul 2023 23:54:08 +0000 (07:54 +0800)
diff --cc etc/NEWS
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Tue, 18 Jul 2023 23:54:08 +0000 (07:54 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Tue, 18 Jul 2023 23:54:08 +0000 (07:54 +0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history